Merge pull request #1 from McF1st/master

Get latest
My first commit
Merge branch 'master' of https://github.com/toftan/Matdagboken

Conflicts:
	.gitignore
	android/.classpath
Added genson class path to project
Added new Entry Activity and camera function

Added all items for a new Entry.
Merge pull request #1 from toftan/master

Added new Entry Activity