AKSW/context — pull request #28 by yamalight (2014-08-28 11:59:17+00:00)
Title: Merge "Resa" to develop

Do code review and merge it into develop once everything is OK