Fixed typo in import View
Merge branch 'view-annotation' into development

Conflicts:
	library/src/com/orm/SugarRecord.java