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
changed Registrator to Registrar in LocationArray
versionCode and versionName incremented
Merge pull request #147 from dewguzzler/master

2 minor changes
Changed out images and relocked the mapActivity to landscape.
Merge https://github.com/ggc-itec/ggc-connect
Merge pull request #148 from Aflynch/master

I fixed the images
last update before STaRS
Merge pull request #149 from dewguzzler/master

just incremented version code..
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/edu/ggc/it/Main.java
	src/edu/ggc/it/catalog/ClassSearchActivity.java
Prevent user from searching while class information for any of the
subjects they requested is still loading
Merge pull request #150 from jsmallwo/master

Search and view results (round 2)
pushed update to store for working class search
Merge pull request #151 from dewguzzler/master

version/code increment
shape the codes
Merge remote-tracking branch 'upstream/master'