rename
new icon
Merge branch 'master' into gh-pages

Conflicts:
	exports/ui/2014-9-16-login-peacefully@1x.jpg
	exports/ui/2014-9-16-login-peacefully@2x.jpg
	exports/ui/2014-9-16login-peacefully@1x.jpg
	exports/ui/2014-9-16login-peacefully@2x.jpg
	exports/ui/login-peacefully@1x.jpg
	exports/ui/login-peacefully@2x.jpg
add new icon