Merge branch 'master' into develop

author fabrixxm <fabrix.xm@gmail.com>

Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)

committer fabrixxm <fabrix.xm@gmail.com>

Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)
author fabrixxm <fabrix.xm@gmail.com>
Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)
committer fabrixxm <fabrix.xm@gmail.com>
Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)
diff --cc view/theme/frio/js/textedit.js
Simple merge
diff --cc view/theme/frio/templates/event_form.tpl
Simple merge
diff --cc view/theme/frio/templates/head.tpl
Simple merge
author	fabrixxm <fabrix.xm@gmail.com>
	Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)
committer	fabrixxm <fabrix.xm@gmail.com>
	Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)
		1	2
view/theme/frio/js/textedit.js	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/frio/templates/event_form.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/frio/templates/head.tpl	patch \|	diff1 \|	diff2 \|	blob \| history