fucking types
merge
>>>>>
Merge branch 'develop' of http://gitlab.fti.pagekite.me/qa/rubyweb into develop
fix programtype
remove debug command line
remove bug command
remove...
add question types
Fix small fucking bugs in conjunction with type
Merge branch 'develop' of 10.3.9.238:qa/rubyweb into develop
remove time format
Merge branch 'develop' of http://gitlab.fti.pagekite.me/qa/rubyweb into develop
fix tenis->tennis
some minnor
merge
display bug
update display