v 1.0.0
Merge branch 'master' of github.com:angal/arcadia

Conflicts:
	conf/arcadia.conf