Adding basic entry layout with broken add
Merge branch 'master' of https://github.com/narcolepticsnowman/Beer-Journal

Conflicts:
	.idea/misc.xml
	AndroidManifest.xml
	Beer-Journal-Test/project.properties
	project.properties