More Guidelines
No Java 7 code due to Android limitations
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'