Code cleanup
Merge branch 'master' of https://github.com/clearpath-networks/apiomatic

Conflicts:
	APIOMatic/src/main/java/com/cpn/apiomatic/controller/ControllerMethodDescription.java
	APIOMatic/src/main/java/com/cpn/apiomatic/generator/model/TypeDefinitionFactory.java
Merge branch 'master' of https://github.com/clearpath-networks/apiomatic
Merge branch 'master' of https://github.com/clearpath-networks/apiomatic
fixing minor bugs in class naming
Timed annotation