ajax supoort
Merge branch 'master' of https://github.com/jerryxing98/Tully

Conflicts:
	sites/root_static/js/main.js