bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/digitalbuddha/daggerdemo/DemoApplication.java
	build/intermediates/dex-cache/cache.xml
Merge remote-tracking branch 'origin/master'