Merge branch 'master' into dandev20140213
Minor routing stuff
Merge branch 'dandev20140213'
Many changes made.

Character, CharTag models.
Some chars and char tags hard coded in.
Some changes to Con model.
Photo view now shows Characters tagged in photo.
Merge branch 'dandev20140213'