Android studio 0.8.1 and build tools 0.12
Retrofit 1.6.1
Merge branch '00_start' into 01_dagger

Conflicts:
	app/app.iml
Fix after merge