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 #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'
added weather feature and set non static for variables
Merge pull request #152 from thaives/master

Direction feature
set the drawables to null on views
Merge pull request #153 from crystalist/master

Set drawables for imageviews to null
Updated the options menu on the Main screen (no "More" menu, icons flow onto the action bar if there's room, everything is Android 3.0+ compliant, other minor things)