update
Merge branch 'develop' of https://github.com/amcclary/Kiwi into develop

Conflicts:
	views/splash/index.jade
Merge branch 'develop' of https://github.com/amcclary/Kiwi into develop
push