Organized all files to be ready to pull into server
Merge branch 'release/0.1.1' into develop