Updated
Merge branch 'master' of https://github.com/IceRoboticsLtd/kick

Conflicts:
	pre-public/pages/admin/examples/admin-index.html.sample
Merge branch 'master' of https://github.com/IceRoboticsLtd/kick