devise keys modified
Added js for hiding and showing serve-marker html element
Merge branch 'develop' into scorer_feature