Switched to Maven annotations
Merge branch 'annotations' into unit-tests

Conflicts:
	src/main/java/com/ffbit/maven/solr/AbstractSolrMojo.java