Added catchall for OPTIONS
Updated pom
Merge branch 'preparing-0.2'

Conflicts:
	pom.xml