Commit 855d09019d2226a5b2d3251dc26eebf9a0039a86

Anon Ray
Mon Jul 07 21:13:40 IST 2014

Tree SHA1: a4d4eca
Parent SHA1: ecc031b (Fix CSS issues in text annotation)
Parent SHA1: f27c414 (In annotations, when a link is added, it should linkified)

Merge branch 'persona' into annotator

Resolve Conflicts:
	swtr/server.py

Merge persona branch with the latest fixes.