Merge pull request #1 from toftan/master

Added new Entry Activity
Merge pull request #2 from toftan/master

Get Latest from toftan
Added several icons and styles

Yellow styles
Launcher Icon
Help Icon
Calander Icon
Merge pull request #3 from toftan/master

Get latest from toftan
Merge branch 'master' of https://github.com/McF1st/Matdagboken

Conflicts:
	android/res/menu/newentryactionbar.xml
	android/res/values/styles.xml
Merge pull request #2 from McF1st/master

Get latest