Merge branch 'master' of github.com:Benn83uk/SpaceAppsChallenge2014
Merge branch 'master' into develop
add objectify libs
Update gitignore
Add classpath
Fix conflict gitignore
Merge branch 'develop' of https://github.com/Benn83uk/SpaceAppsChallenge2014 into develop
Merge branch 'develop' of github.com:Benn83uk/SpaceAppsChallenge2014 into develop
Bootstrap CSS and JSP
Merge branch 'develop' of github.com:Benn83uk/SpaceAppsChallenge2014 into develop
use included appengine sdk
Home servlet and some constants files2
Merge branch 'develop' of https://github.com/Benn83uk/SpaceAppsChallenge2014 into develop
Weird update
Merge branch 'develop' of github.com:Benn83uk/SpaceAppsChallenge2014 into develop
snapper service
Lots of things
Merge branch 'develop' of github.com:Benn83uk/SpaceAppsChallenge2014 into develop
Maps added
pre-photo upload