first style fixes - @samtuke: I added some TODO regarding undefined variables and unreachable code - please review
Fixed todos: undefined vars and unreachable code
Merge branch 'master' into files_encryption-style-fixes
Merge branch 'master' into files_encryption-style-fixes

Conflicts:
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
Reverted erroneous commit
Merge branch 'master' into files_encryption-style-fixes

Conflicts:
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/util.php
cleanup - more to come after
Merge pull request #1383 from owncloud/files_encryption-style-fixes

first style fixes - @samtuke: I added some TODO regarding undefined vari...