Front-end added
Resolved conflicts - Merge to master

Conflicts:
	sfotipy/main/templates/base.html
	sfotipy/main/templates/player.html
	sfotipy/sfotipy/static/js/code.js