Added model and controller code to deal with multiple types of entries to the relationship feed

Uses entry_type to decide which kind of entry is being made and records the question if the mentee is answering a question. If the entry_type is 'emoticon', which emoticon is picked is placed in the text field.
Merge branch 'master' of https://github.com/rhok-melbourne/startout