updated modules site
Merge pull request #207 from svenkubiak/develop

updated modules site
Revert "BugFix #157. @UnitOfWork did not work when nested with @Transactional or other @UnitOfWork annotations."

This reverts commit c2d8e8f802cd54ecd75b7c87fc563d65b5c0c9e3.

Conflicts:
	ninja-core/src/site/markdown/developer/changelog.md
	ninja-servlet-jpa-blog-integration-test/src/test/java/controllers/BugReproductionControllerDocTesterTest.java
Tiny naming convention fix.
Adding corrections to JPA documentation: @Transactional, @UnitOfWork and RESOURCE_LOCAL
Adding corrections to JPA documentation: @Transactional, @UnitOfWork and RESOURCE_LOCAL
Adding corrections to JPA documentation: @Transactional, @UnitOfWork and RESOURCE_LOCAL
Merge pull request #209 from nobullet/develop

Adding corrections to JPA documentation: @Transactional, @UnitOfWork and...
Fixed typo.
Merge branch 'develop' of github.com:ninjaframework/ninja into bugfix/185-unitofwork-bug
Clarified changelog.
Merge pull request #208 from ninjaframework/bugfix/185-unitofwork-bug

Revert "BugFix #157.
Preparations for 3.3.1.
[maven-release-plugin] prepare release ninja-3.3.1
[maven-release-plugin] prepare for next development iteration
Update debugging.md
Merge pull request #212 from sappo/patch-1

Debugging description for Netbeans
Fixing spelling of a ninja bootstrap variable.
Merge pull request #214 from mattjonesorg/develop

Fixing spelling of a ninja bootstrap variable.
Async ContextImpl