fix question type bug
add ng-show to questions view
display q_ids in two columns
merge with master
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop