added feedbox, 3 column layout
Merge branch 'develop' into feature/user-playlist

Conflicts:
	templates/search-box.html