settings page

finished main functionality of settings page
Merge branch 'master' of https://github.com/ahmadkfarag/OSU-TBI-ID

Conflicts:
	gen/com/tbi_id/R.java