adding models and features
Merge branch 'master' of https://github.com/hongkunyoo/athere-android

Conflicts:
	res/values/strings.xml