Impemented a few fixes for ios7
moved work to a new branch
adding position absolute to elements in version 2
added carbs for the 4in landscape
beer count 2.0 final
Merge branch 'refs/heads/version2'

Conflicts:
	webapp/index.php