Merge pull request #8 from IanHung/dev

Dev
Merge branch 'master' into Ian

Conflicts:
	README.md
	forum/models.py
	static/html5test/css/custom.css
	templates/base.html
	timeview/templates/timeview/time.html
Fixed the id filter used to determine position in transcript.
Fixed the side button.
Hope it works now.
ok
ok
Merge branch 'Ian' into dev

Conflicts:
	README.md
	forum/models.py
	sqlite.db
	static/html5test/css/custom.css
	timeview/templates/timeview/time.html
dfds
deleted unused css
Fixed the javascript.
Created Models for article class.
Moved comment ajax response to forum head.
updated comment forms to allow for 3 types: timelike, imageclass, sentence
Merge branch 'tingtest' into Ian

Conflicts:
	sqlite.db
	static/html5test/css/custom.css
	static/html5test/js/custom.js
Nothing changed I think