Solution Updates.
Merge remote-tracking branch 'origin/master'

Conflicts:
	miyagi-web/lib/public/views/index.jade