Update version number.
Merge branch 'dev' into release

Conflicts:
	app/admin/application.php
Merge branch 'release'