Creating template
Merge branch 'master' of ssh://web-thinkingatoms.rhcloud.com/~/git/web

Conflicts:
	setup.py
init
Deploy from Web2py IDE