Merge branch 'master' of https://github.com/NiFuCo/bones

Conflicts:
	frontend/app/scripts/app.js
app/index
Merge branch 'master' of https://github.com/NiFuCo/bones