- updated to Android Studio 1.0 Final
Merge branch 'develop' into feature/material_design

Conflicts:
	app/build.gradle
	build.gradle
	gradle/wrapper/gradle-wrapper.properties