Update
Merge branch 'master' of https://github.com/as11712/Skrolls into as11712-master

Conflicts:
	app/data/skrolls/skrolls.json
	app/index.html
	app/scripts/app.js
	app/views/skroll.html
	app/views/skrolls-list.html
	app/views/user.html