Timetable.java
Merge pull request #1 from jclyons52/Gabriel's_branch

Timetable.java
Changed location
Merge pull request #2 from jclyons52/Gabriel's

Changed location
added git ignore for gen, bin, .metadata and .settings
trying to get these bin files into the ingnore file, need to merge before i can push
Merge branch 'joseph'
added models, JSON parsers and start of ui's for selecting program and group from records from the web service
cleaned up new activities, added server requests to on create methods, removed get data buttons, added Shanes logo to activities, got rid of request package, with the current server its less work to just use a string builder in each activity for its url
Merge branch 'master' into Peaders_Branch

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/TimeTableapp.apk
	bin/classes.dex
	bin/resources.ap_
	res/values/styles.xml