Merge: backbone app updated
code beautification