updates app to latest ember, ember data
moves all website index logic into website files,
it is not really a website index, more like a show page.
Also determines model with a filter and the param slug
fixes needs relationships between website, websiteIndex, and assets
adds files
nest web template resources under webpage, still needs work
fixes route and link to webHomeTemplate
fixes empty trash save
set up model for webpagetemplate route, fix save items
fixes layout issue with website template
merges master
fixes pending spec
fixes gemfile.lock which broke after bad merge with master
adds back l-container for specs
Merge branch 'master' of github.com:G5/g5-content-management-system into upgrade-ember

Conflicts:
	spec/support/vcr_cassettes/Integration_/web_template/_id_/Renders_preview_of_compiled_web_template/website_instructions/Liquid_parsing_in_settings/correctly_parses_and_displays_location_address_in_title.yml
	spec/support/vcr_cassettes/Integration_/web_template/_id_/Renders_preview_of_compiled_web_template/website_instructions/Liquid_parsing_in_settings/correctly_parses_and_displays_location_info_in_title.yml
	spec/support/vcr_cassettes/Integration_/web_template/_id_/Renders_preview_of_compiled_web_template/website_instructions/Liquid_parsing_in_settings/correctly_parses_and_displays_page_name_in_title.yml
	spec/support/vcr_cassettes/Integration_/web_template/_id_/Renders_preview_of_compiled_web_template/website_instructions/When_settings_are_not_set/displays_name_in_navigation_widget_in_nav_section.yml
	spec/support/vcr_cassettes/Integration_/web_template/_id_/Renders_preview_of_compiled_web_template/website_instructions/When_settings_are_not_set/has_a_rel_canonical_link.yml
	spec/support/vcr_cassettes/Integration_/web_template/_id_/Renders_preview_of_compiled_web_template/website_instructions/When_settings_are_not_set/has_web_template_title_in_title_tag.yml
	spec/support/vcr_cassettes/Integration_/web_template/_id_/Renders_preview_of_compiled_web_template/website_instructions/When_settings_are_set/has_some_text_set_in_the_HTML_widget.yml
Merge pull request #413 from G5/upgrade-ember

[WIP] updates app to latest ember, ember data