UI Integration 1/2/2014 6:56
Merge branch 'master' of https://github.com/Zarconium/crisp