Renamed controller to baseController added controller trait
Merge branch 'development' of github.com:m410/brzy-mod-squeryl into development

Conflicts:
	src/test/scala/org/brzy/mvc/mock/PersonController.scala
Merge branch 'development' of github.com:m410/brzy-mod-jpa into development

Conflicts:
	src/test/scala/org/brzy/mod/jpa/mock/UserController.scala
Merge branch 'development' of github.com:m410/brzy into development

Conflicts:
	src/main/scala/org/brzy/controller/AuthController.scala
	src/main/scala/org/brzy/controller/AuthenticatorController.scala
	src/main/scala/org/brzy/controller/DefaultAuthController.scala
	src/main/scala/org/brzy/webapp/action/Action.scala
	src/main/scala/org/brzy/webapp/application/WebApp.scala
	src/main/scala/org/brzy/webapp/controller/AuthController.scala
	src/main/scala/org/brzy/webapp/controller/Controller.scala
	src/main/scala/org/brzy/webapp/controller/CrudController.scala
	src/test/scala/org/brzy/mock/MockWebApp.scala
	src/test/scala/org/brzy/mock/UserArgController.scala
	src/test/scala/org/brzy/mock/UserController.scala
	src/test/scala/org/brzy/webapp/action/args/ArgsBuilderSpec.scala
	src/test/scala/org/brzy/webapp/action/args/Fixtures.scala
	src/test/scala/org/brzy/webapp/application/Fixture.scala
Merge branch 'development' of github.com:m410/brzy-mod-calista into development

Conflicts:
	src/test/scala/org/brzy/mod/calista/mock/PersonController.scala
Fixed merge conflicts