Merge develop into 1901_autocomplete

author rabuzarus <trebor@central-unit>

Sat, 30 Jan 2016 15:57:54 +0000 (16:57 +0100)

committer rabuzarus <trebor@central-unit>

Sat, 30 Jan 2016 15:57:54 +0000 (16:57 +0100)
author rabuzarus <trebor@central-unit>
Sat, 30 Jan 2016 15:57:54 +0000 (16:57 +0100)
committer rabuzarus <trebor@central-unit>
Sat, 30 Jan 2016 15:57:54 +0000 (16:57 +0100)
diff --cc js/main.js
Simple merge
diff --cc view/theme/vier/style.css
Simple merge
author	rabuzarus <trebor@central-unit>
	Sat, 30 Jan 2016 15:57:54 +0000 (16:57 +0100)
committer	rabuzarus <trebor@central-unit>
	Sat, 30 Jan 2016 15:57:54 +0000 (16:57 +0100)
		1	2
js/main.js	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/vier/style.css	patch \|	diff1 \|	diff2 \|	blob \| history