Merge remote-tracking branch 'upstream/master' into sortorder
simplify annotation
Merge remote-tracking branch 'origin/sortorder' into alltogether

Conflicts:
	ProviGen/src/com/tjeannin/provigen/ProviGenProvider.java
	ProviGenTests/src/com/tjeannin/provigen/test/sort/SortContentProvider.java