Merge branch 'master' into fix_addNavigation
remove superfluous enabled-app class again
shift infield labels just a tiny bit to the right so the cursor doesn't overlap
form detail on log in button, better shape
line up 'remember' text with checkbox
Fixed todos: undefined vars and unreachable code
Remove superfluous append
Merge pull request #1456 from owncloud/gitignore-apps

gitignore all apps except core ones
Merge github.com:owncloud/core
Merge pull request #1460 from owncloud/login-button

Login screen details
Merge pull request #1429 from owncloud/fix_addNavigation

Make app icon linkable when enabling app.
new function \OC_Util::runningOnWindows()
setlocale test is pointless on Windows
Merge pull request #1452 from owncloud/fix-breadcrumb

Remove undefined crumb variable from home breadcrumb
Merge pull request #1469 from owncloud/no-setlocale-on-windows

No setlocale on windows
pass the argument to the ctor

Conflicts:
	lib/files/storage/temporary.php
spell check
Recryption of legacy encrypted files now working on login
Minor improvement to comments
disable error handler while running phpunit