broken camera :(
Merge branch 'master' into camera

Conflicts:
	.meteor/packages
	.meteor/versions
after update preview
changed camera icon and some basic functionality
all
nothing much
improved camera functionality, notes now stored as photo and seperate template with photo link
camera fully working, besides some positioning issues ready for merge master
created forgotpassword feature, only positioning of send button to be done
centered password button, merging with master
added android platform