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

Conflicts:
	views/detail/index.jade