New setup.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/src/main/java/com/richieapps/materialgirl/MaterialActivity.java
	mobile/src/main/res/values-v21/styles.xml
New setup fixes
Updated to 21