Solve the previous problem
Merge branch 'master' of https://github.com/ddp34/WebIDEPodgurski2014

Conflicts:
	webide/web_ide/views.py