deveop
Merge branch 'develop', remote-tracking branch 'origin' into feature/20130206_hearing_note