initial
Merge branch 'release/1.7'

Conflicts:
	.gitignore
	build.gradle
Merge commit 'fb84a10b855a33830d78461b327bdf99504b7891'

* commit 'fb84a10b855a33830d78461b327bdf99504b7891':
  bilde has been busy
  Security update and other stuff
  Cleaned up
  Fixed some minor things
  Update LICENSE
  Deleted protocol.txt