amulius/group-project-base — pull request #22 by amulius (2014-10-31 06:41:30+00:00)
Title: current v1 into master

getting master up to current dev to have it live for demo