Merging
Merge branch 'master' of https://github.com/PyConference/PyConference

Conflicts:
	pyconference.db
Moving templates to Bootstrap 3.1.1