Merge branch 'jey_qraat_site_0.1' of https://github.com/QRAAT/QRAAT into jey_qraat_site_0.1
Merge branch 'master' into jey_qraat_site_0.1
set qraat_ui template to use base template
Merge branch 'alisha' into jey_qraat_site_0.1

Conflicts:
	www/qraatview/templates/qraat_ui/index.html
Merge branch 'master' of https://github.com/qraat/qraat
Link from UI to home page.

TODO add pretty CSS stuff.