this was modified automatically
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project
added boxes for latitude and longitude
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project

Conflicts:
	CMPUT301T02Project/gen/ca/ualberta/cs/cmput301t02project/R.java
	CMPUT301T02Project/res/values/strings.xml
added in the spaces to type latitude and longitude