Merge pull request #85 from j3rn/develop

Moved 'new' buttons to profile page
Clean up the dashboard view and hide the recent uploads from people you're following unless you follow someone
Merge pull request #86 from Icarurs/develop

Clean up the dashboard view
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop

Because I really need it
Merge pull request #87 from j3rn/develop

Cleaned up the images controller
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop