Merge branch 'hotfix/pins_key_bug'
Updated readme. 

Something strange must have happened when I merged things because the html was a little bit off and I fixed that in a prior commit.
Changed android target version to 4.2.2 (API level 17) and added stubs for Map and Comment pages
Set up basic UI components for MainActivity
Merge branch 'master' into develop

Merged the original changes I made to the android client, resolved conflicts and made sure
it still compiled.  The swipe to switch between tabs is nice and was different than what I had in mind.  I removed the bin/ and gen/ directories from version control.

Conflicts:
	android/.gitignore
	android/AndroidManifest.xml
	android/bin/AndroidManifest.xml
	android/gen/com/xenon/greenup/BuildConfig.java
	android/gen/com/xenon/greenup/R.java
	android/res/layout/activity_main.xml
	android/res/values/dimens.xml
	android/res/values/strings.xml