Merge
Merge branch 'release-build-3'

Conflicts:
	.gitignore
	final_project_workspace/Sculptor/war/WEB-INF/appengine-web.xml
Merge
Some fixes and preview/cancel skeleton
Ignores...
Ignores
classpath
Merge branch 'master' into development
Ignores got corrupted