Merge pull request #118 from jsmallwo/master

New class search feature
Fix for Github NumberFormatException
Bug fixes related to parsing credit hours and some changes to the
ClassSearchActivity layout
Add search results
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/edu/ggc/it/banner/CourseDB.java
change markers and define text
Changed background to white for main screen
Merge remote-tracking branch 'upstream/master' into main-btn-images
implemented onBackPressed() for map feature
Merge pull request #142 from rramsaro/main-btn-images

Changed Background on main screen
Merge remote-tracking branch 'upstream/master'
Merge pull request #143 from crystalist/master

Implemented onBackPressed() for map feature
activity_empty added
update key
Merge remote-tracking branch 'upstream/master'
Merge pull request #144 from crystalist/master

added activity_empty.xml
removed secret
Merge pull request #145 from thaives/master

change markers
Merge pull request #146 from crystalist/master

removed secret
changed Registrator to Registrar in LocationArray