import files from master

implement encryption options

move GenerateKeys out of encrypt.py, add key_path to settings

add memlimit option to generateKeys, use motioneye conf_path for key retrieval

generateKeys.py: backup existing key files

make generateKeys.py non-interactive, introduce option to upload unencrypted files to cloud in case encryption fails

more logging

add --directory option to generateKeys

remove whitespace

add decryption tool

add option to remove unencrypted source file

fix removeSourceFile function

store memlimit in keyfile

simplify write operations, add shebang to decrypt.py

add shebang to generateKeys.py

simplify file operations

move encryption options to file storage options, add --file parameter to decrypt.py

remove -d parameter from decrypt.py, add --directory and --file instead

don't throw traceback if decryption of a file fails

move decryption script to motioneye folder

modify code to fit rest of motionEye, add entry point for key generation tool to setup.py

pass mem to write_private_key

use current version of main.js from dev branch

add pynacl to Dockerfile

add python-dev to Dockerfile.armv7-armhf

add gcc6 and libffi-dev to Dockerfile.armv7-armhf

use gcc-arm-linux-gnueabihf instead of gcc6

use build-essential instead of gcc-arm-linux-gnueabihf in Dockerfile.armv7-armhf

add new .travis.yml from dev

add new main.js from dev

dont remove obsolete whitespace in main.js