New Build - Hopefully fixes certificate error
Merge branch 'master' of https://github.com/ecthurlow/InfoRail.git

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/archtypestudios/inforail/QuizActivity.class
	bin/classes/com/archtypestudios/inforail/R$menu.class
	bin/classes/com/archtypestudios/inforail/SelectedTrainActivity.class
	bin/classes/com/archtypestudios/inforail/TrainBuilderActivity.class
	bin/classes/com/archtypestudios/inforail/db/DatabaseManager.class
	bin/classes/com/archtypestudios/inforail/repositories/Repository.class
	gen/com/archtypestudios/inforail/R.java
	res/layout/activity_home.xml
	res/layout/activity_quiz.xml
	res/layout/activity_selected_train.xml
	res/layout/activity_train_builder.xml
	res/menu/quiz.xml
	res/menu/selected_train.xml
	res/menu/train_builder.xml
	res/values-sw600dp/dimens.xml
	res/values-sw720dp-land/dimens.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/archtypestudios/inforail/HomeActivity.java
	src/com/archtypestudios/inforail/QuizActivity.java
	src/com/archtypestudios/inforail/SelectedTrainActivity.java
	src/com/archtypestudios/inforail/TrainBuilderActivity.java
	src/com/archtypestudios/inforail/db/DatabaseManager.java
	src/com/archtypestudios/inforail/repositories/Repository.java