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
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)