db
Merge branch 'master' of https://github.com/sctravel/knowledgeRepo

Conflicts:
	src/com/apps/knowledgeRepo/ModeSelectionActivity.java
Merge branch 'master' of https://github.com/sctravel/knowledgeRepo
db
Merge branch 'master' of https://github.com/sctravel/knowledgeRepo
db
db
db
db
db
db