Merge pull request #16 from jsicree/dev

Merge pull request #15 from jsicree/master
Merge pull request #17 from jsicree/dev

Added SQL files, cleaned up service tests
Merge pull request #18 from jsicree/dev

Added springweb project
Removed springapp dependency (for now)
Merge branch 'master' into dev

Conflicts:
	tutorials/20130920_java_spring_maven/springweb/pom.xml
Merge pull request #20 from jsicree/dev

no change
Merge pull request #21 from jsicree/dev

Created static ServiceManager, added tests of services from web project
Merge pull request #22 from jsicree/dev

Added queries that use enums to repository class.
Merge pull request #23 from jsicree/master

Synching dev with master