rm bootstrap.php
Merge branch 'develop'