right side column fields fix
Merge branch 'master' of github.com:huridocs/OpenEvSys

Conflicts:
	inc/lib_form_util.inc
merge fix
global conf fix
SUP-7
version title
merged master and twitetrbootstrap