adding bikestation
ignoring intellij files
ignoring intellij files
add fire station / school / bixi station cards
Merge branch 'master' of https://github.com/rlabancz/yellowsubmarine

Conflicts:
	src/com/google/android/glass/sample/compass/PropertyMenuActivity.java