Merge pull request #1 from devilshaircut/dtp/sep4

Dtp/sep4
Views aggregator
Merge branch 'master' of https://github.com/devilshaircut/youstars into dtp/sep5

Conflicts:
	app/models/user.rb