bump
Merge branch 'master' of https://github.com/chadamine/Asimov.git

Conflicts:
	GrowBuddy/bin/GrowBuddy.apk
	GrowBuddy/bin/classes.dex
	GrowBuddy/bin/resources.ap_
	GrowBuddy/gen/android/support/v7/appcompat/R.java
	GrowBuddy/gen/com/chadamine/growbuddy/R.java