handle @Extra after @Bean
Merge branch 'develop' into handle_extras_after_beans
Merge branch 'develop' into AfterExtra
Merge branch 'develop' into handle_extras_after_beans
add test
fix test... stupid eclipse
add test for pre set intent that is injected in onCreate()
Merge branch 'develop' into AfterExtra
update copyright year in header
Merge branch 'develop' into handle_extras_after_beans
Merge branch 'handle_extras_after_beans' into mysnap
Merge branch 'AfterExtra' into mysnap