Merge branch 'Wall/master'
[findit] / src / mvc / controllers / application.py