Initial variant that allows for an external project spec
Update merge from local master.

Conflicts:
	interactivespaces-workbench/src/main/java/interactivespaces/workbench/InteractiveSpacesWorkbench.java
Resolving merge conflicts
More sensless refactoring
Merge branch 'master' into projectSpec

Conflicts:
	interactivespaces-workbench/src/main/java/interactivespaces/workbench/InteractiveSpacesWorkbench.java
	interactivespaces-workbench/src/main/java/interactivespaces/workbench/project/activity/creator/BaseActivityProjectTemplate.java
Merge cleanup
Project template refactoring
Lint check
Fixing template problem
Adding web project template
MOre refactoring
Adding ability to add extra template lines
Add ability for extra lines to template files
Fix template to also include CSS file
Lint cleanup
New code review request for branch projectSpec, commit 457.
Addressing lint
Cleanup and making dependencies
Updating to new way of doing XML templates
Updating to new way of doing XML templates