Commit a1fda4d34cb43b4f0e0dd1abcb9596960808b882

  • Tree SHA1: 8043ae6
  • Parent SHA1: 937e032 (Moving more to server side)
  • Parent SHA1: 9fff9f3 (Whitespace and indentation changes.) 
Merge branch 'dev' of git.pantoto.org:mouchak/mouchak into dev