Remove stuff from master to be completed in the workshop
Merge branch 'master' of github.com:scmspain-segundamano/techConf2014_microservices

Conflicts:
	microserviceA_Solution/src/main/java/io/scmspain/tech2014/server/simple/annotation/SimpleRoutingApp.java