Index files
Merge branch 'master' of https://github.com/icompuiz/node-toastycms

Conflicts:
	app/scripts/states/index.js