A bunch of comments, my final commit :)
Merge branch 'dev' of https://github.com/OPEC-PML/GISportal into dev