correct https call. correct html error when grunt building
correct conflicts
Merge pull request #34 from etrom/issue/aviary

Issue/aviary