backendConnnection

Added backend to front end hooks
updateLocations

Giving locations awareness of other locations
Integration of Mirror API
7/01/14

end of work day
Merge remote-tracking branch 'origin/master'

Conflicts:
	gwt-unitCache/gwt-unitCache-b43fe07841b100c5f8cde7d5e855fc294f6a56f4-0000014965543C3B
	gwt-unitCache/gwt-unitCache-b43fe07841b100c5f8cde7d5e855fc294f6a56f4-000001496D786D94
	gwt-unitCache/gwt-unitCache-b43fe07841b100c5f8cde7d5e855fc294f6a56f4-000001496D8D3DB6
	gwt-unitCache/gwt-unitCache-b43fe07841b100c5f8cde7d5e855fc294f6a56f4-000001496DABD9D2
	modified:   resources/oauth.properties
	modified:   src/com/capstonewebui/client/WorldCreationForm.java
	modified:   src/com/capstonewebui/server/DatabaseHandlerImpl.java
	modified:   war/WEB-INF/appengine-web.xml
	modified:   war/WEB-INF/classes/com/capstonewebui/client/WorldCreationForm$SaveButtonHandler.class
	modified:   war/WEB-INF/classes/com/capstonewebui/server/DatabaseHandlerImpl.class
	modified:   war/WEB-INF/lib/appengine-api-labs.jar
	modified:   war/WEB-INF/web.xml
Server Side World Object Upgrade

upgraded server side to handle world objects
11/01/14

end of day
Merge branch 'DaveBach' of https://github.com/hhbach/CapstoneWebUI into DaveBach
12:16/8/14