Android Studio 0.5.4
Merge branch '01_dagger' into 02_welcome_dialog_manager_tests