Code Style
javadoc
Merge remote-tracking branch 'official-origin/master' into feature-maven
Updated to latest version 1.6.0
Updated to 1.6.0
Merge branch 'feature-batch' of github.com:Shusshu/ProviGen into feature-batch

Conflicts:
	ProviGen/src/com/tjeannin/provigen/ProviGenProvider.java
Merge remote-tracking branch 'official-origin/master' into feature-extended-query

Conflicts:
	ProviGen/src/com/tjeannin/provigen/ProviGenProvider.java
Merge branch 'feature-maven' into shusshu-master
Merge branch 'feature-batch' into shusshu-master

Conflicts:
	ProviGen/src/com/tjeannin/provigen/ProviGenProvider.java
Merge branch 'feature-extended-query' into shusshu-master

Conflicts:
	ProviGen/src/com/tjeannin/provigen/ProviGenProvider.java