RAPIID/RAPIID-MC — pull request #1 by Spacyyeti (2013-09-17 19:48:53+00:00)
Title: Dev

Merge dev with master