Add a grid view (partial)
themes
Merge branch 'ui_stuff' of https://github.com/CrossroadsAndroid/AndroidApp into ui_stuff

Conflicts:
	CrossRoads/app/src/main/java/com/codepath/crossroads/activities/global/LoginActivity.java
	CrossRoads/app/src/main/res/values/colors.xml
	CrossRoads/app/src/main/res/values/styles.xml