+ option page
+ option page
Merge branch 'master' of github.com:rthees/wp-stadtklick

Conflicts:
	readme.txt