Various changes
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/MainListViewActivity.java
fdfsd