Goodbye built-in Python web server. Hello bottle! Need to rework create project part (needed in any case and much easier now we have bottle).
Resolved minor merge conflict around image files etc.

Merge branch 'master' of https://github.com/catalyst/basil

Conflicts:
	images/basil_logo.png
	web.py