commit to update
Merge branch 'master' of https://github.com/donaldheer/TekScholar2014Client

Conflicts:
	TekScholarClientProject/TekScholarClientProject.iml