update service and dao
delete local-controller & create button-component
add mergely
add mergely
add mergely
Merge branch 'gh-pages'

Conflicts:
	build/bower_components/bacon/.bower.json
	build/bower_components/bacon/Gruntfile.coffee
	build/bower_components/bacon/README.md
	build/bower_components/bacon/RELEASE-NOTES.md
	build/bower_components/bacon/bower.json
	build/bower_components/bacon/component.json
	build/bower_components/bacon/dist/Bacon.js
	build/bower_components/bacon/dist/Bacon.min.js
	build/bower_components/bacon/package.json
	build/bower_components/bacon/performance/MemoryTest.coffee
	build/bower_components/bacon/readme-src.coffee
	build/bower_components/bacon/spec/BaconSpec.coffee
	build/bower_components/bacon/src/Bacon.coffee
	build/bower_components/jquery-ui/.bower.json
	build/bower_components/jquery.event.drag-drop/.bower.json
	build/bower_components/jstree/.bower.json
	build/bower_components/portamento/.bower.json
	build/bower_components/sammy/.bower.json
	build/bower_components/select2/.bower.json
	build/bower_components/select2/bower.json
	build/bower_components/select2/component.json
	build/bower_components/select2/composer.json
	build/bower_components/select2/package.json
	build/bower_components/select2/select2.css
	build/bower_components/select2/select2.jquery.json
	build/bower_components/select2/select2.js
	build/bower_components/select2/select2.min.js
	build/bower_components/select2/select2_locale_ar.js
	build/bower_components/select2/select2_locale_az.js
	build/bower_components/select2/select2_locale_bg.js
	build/bower_components/select2/select2_locale_ca.js
	build/bower_components/select2/select2_locale_cs.js
	build/bower_components/select2/select2_locale_da.js
	build/bower_components/select2/select2_locale_de.js
	build/bower_components/select2/select2_locale_el.js
	build/bower_components/select2/select2_locale_en.js.template
	build/bower_components/select2/select2_locale_es.js
	build/bower_components/select2/select2_locale_et.js
	build/bower_components/select2/select2_locale_eu.js
	build/bower_components/select2/select2_locale_fa.js
	build/bower_components/select2/select2_locale_fi.js
	build/bower_components/select2/select2_locale_fr.js
	build/bower_components/select2/select2_locale_gl.js
	build/bower_components/select2/select2_locale_he.js
	build/bower_components/select2/select2_locale_hr.js
	build/bower_components/select2/select2_locale_hu.js
	build/bower_components/select2/select2_locale_id.js
	build/bower_components/select2/select2_locale_is.js
	build/bower_components/select2/select2_locale_it.js
	build/bower_components/select2/select2_locale_ja.js
	build/bower_components/select2/select2_locale_ka.js
	build/bower_components/select2/select2_locale_ko.js
	build/bower_components/select2/select2_locale_lt.js
	build/bower_components/select2/select2_locale_lv.js
	build/bower_components/select2/select2_locale_mk.js
	build/bower_components/select2/select2_locale_ms.js
	build/bower_components/select2/select2_locale_nl.js
	build/bower_components/select2/select2_locale_no.js
	build/bower_components/select2/select2_locale_pl.js
	build/bower_components/select2/select2_locale_pt-BR.js
	build/bower_components/select2/select2_locale_pt-PT.js
	build/bower_components/select2/select2_locale_ro.js
	build/bower_components/select2/select2_locale_rs.js
	build/bower_components/select2/select2_locale_ru.js
	build/bower_components/select2/select2_locale_sk.js
	build/bower_components/select2/select2_locale_sv.js
	build/bower_components/select2/select2_locale_th.js
	build/bower_components/select2/select2_locale_tr.js
	build/bower_components/select2/select2_locale_uk.js
	build/bower_components/select2/select2_locale_vi.js
	build/bower_components/select2/select2_locale_zh-CN.js
	build/bower_components/select2/select2_locale_zh-TW.js
	build/bower_components/slickgrid/.bower.json
	build/bower_components/tinymce/.bower.json
	build/bower_components/tinymce/bower.json
	build/bower_components/tinymce/changelog.txt
	build/bower_components/tinymce/plugins/autoresize/plugin.js
	build/bower_components/tinymce/plugins/autoresize/plugin.min.js
	build/bower_components/tinymce/plugins/autosave/plugin.js
	build/bower_components/tinymce/plugins/autosave/plugin.min.js
	build/bower_components/tinymce/plugins/fullpage/plugin.js
	build/bower_components/tinymce/plugins/fullpage/plugin.min.js
	build/bower_components/tinymce/plugins/media/plugin.js
	build/bower_components/tinymce/plugins/media/plugin.min.js
	build/bower_components/tinymce/plugins/nonbreaking/plugin.js
	build/bower_components/tinymce/plugins/nonbreaking/plugin.min.js
	build/bower_components/tinymce/plugins/paste/plugin.js
	build/bower_components/tinymce/plugins/paste/plugin.min.js
	build/bower_components/tinymce/plugins/spellchecker/plugin.js
	build/bower_components/tinymce/plugins/spellchecker/plugin.min.js
	build/bower_components/tinymce/plugins/table/plugin.js
	build/bower_components/tinymce/plugins/table/plugin.min.js
	build/bower_components/tinymce/themes/modern/theme.js
	build/bower_components/tinymce/themes/modern/theme.min.js
	build/bower_components/tinymce/tinymce.jquery.js
	build/bower_components/tinymce/tinymce.jquery.min.js
	build/bower_components/tinymce/tinymce.js
	build/bower_components/tinymce/tinymce.min.js
	build/bower_components/vue/.bower.json
	build/bower_components/vue/bower.json
	build/bower_components/vue/dist/vue.js
	build/bower_components/vue/dist/vue.min.js
	build/bower_components/vue/src/directives/on.js
	build/bower_components/vue/src/directives/style.js
	build/bower_components/vue/src/filters.js
	build/bower_components/vue/src/fragment.js
	build/bower_components/vue/src/main.js
	build/bower_components/vue/src/utils.js
	build/bower_components/vue/src/viewmodel.js
	build/index.html
	build/styles.min.css