Pre-deploy cleanup
Deploy #7 (20140416)
Merge branch 'develop'