Added some functionality
Other changes
Merge branch 'master' of https://github.com/lucazulian/smartwired14hackcity
Modified user and article details
Merge branch 'master' of https://github.com/lucazulian/smartwired14hackcity

Conflicts:
	public/articles/controllers/articles.js
	public/profile/Controllers/profile.js
	server/controllers/users.js