Cleaned source code style
Merge branch 'develop' of github.com:pandorafms/pandorafms into develop