Merge branch 'master' of https://github.com/openlectures/ol2
Precompiled assets: Round 2

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Merge branch 'master' of https://github.com/openlectures/ol2
lalaala

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Merge branch 'master' of https://github.com/openlectures/ol2
Merge branch 'master' of https://github.com/openlectures/ol2
yada

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Merge branch 'master' of https://github.com/openlectures/ol2

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>

Conflicts:
	app/views/topics/show.html.erb