main page
Merge branch 'master' of github.com:antoniopuero/uwc
main page
Merge branch 'master' of github.com:antoniopuero/uwc

Conflicts:
	public/js/app/views/user_articles_view.coffee
	public/js/app/views/user_layout.coffee