First steps with injection
more injection
injection fixes
+ @Inherited annotation for annotations
+ material colors
androidStudio config changed
Merge remote-tracking branch 'origin/develop'

Conflicts:
	android-library.iml
	src/main/AndroidManifest.xml
+ RClass Annotation and better guessing