appirio-tech/arena-web — pull request #388 by phasebeta (2014-12-28 08:21:35+00:00)
Title: Fixed #147 v2 (Resolved merge conflict)

I resolved the merge conflict between latest bug_bounty_3 and my #147 branch.