intellij BS
specify string param to get past compile error
Merge branch 'master' of https://github.com/rlabancz/yellowsubmarine

Conflicts:
	gen/com/google/android/glass/sample/compass/R.java
ignoring idea workspace file
fixing landmarks appearing more than once