removed unneeded code mostly from controllers
switched kata/feedback button to use refactored code; switched help button so it now reads help instead of ?
minor refactoring mostly views now using custom helpers that were already implemented
fixed merge conflicts on 'translate_avatar...'