Add files required for boost
Remove not-needed pre-git file.
Merge branch 'develop'