tkowark/hpi-hiwi-portal — pull request #25 by scriptedSheep (2013-11-18 18:23:40+00:00)
Title: Sprint 1 - Team AK

Merging develop branch into master for acceptance tests by AK PO. Merged additional gems too for tests.