wordcloud fixed, other fixes
Merge pull request #33 from ne0n666/master

wordcloud fixed, other fixes
User skrolls
Update user skrolls-list
Merge pull request #34 from as11712/master

Fixed user skrolls list.
fixing bugs
nothing
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls into bigmerge

Conflicts:
	app/views/skrolls-list.html
again, nothing
nothing
Authentication should be fully functional
Merge pull request #35 from ne0n666/master

Big bug fix pack
Fixed enter skroll and browse
private skroll error message, image upload, g+ fixed
Fixed sorting skrolls lists
Merge pull request #36 from as11712/master

Fixed sorting and user skroll viewing.
control over Skroll visibility and permissions, bug fixes
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls

Conflicts:
	app/scripts/controllers.js
Fixed conflict
more bugs