commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Senior_Design/app/src/main/res/layout/activity_owmain_page.xml

commit Kavin 5 screens