Conflicts:
	pom.xml
	src/main/java/com/data2semantics/yasgui/client/helpers/JsMethods.java
	src/main/java/com/data2semantics/yasgui/shared/StaticConfig.java
	src/main/webapp/codemirror.html
 #153 Revert "added questionnaire link"

This reverts commit 32f970a2e89e9f044e3f8ce319bc0cffcf9a99ae.
updated some settings and classpath
#154: explicitly set compilation style to obfuscated
merged dev branch
Merge branch 'dev'
Merge branch 'dev'
#162 fixed query permalink functionality
disabled propery autocompletion in master branch
Merge branch 'master' into dev
added selenium files
#164 fixed setting of accept header for selects
Merged #164 into dev
#169 fixed bookmark query layout issue
merged #169
#129 created selenium tests
merge #129 (added selenium tests)