Updated the pom to 1409a.
Merge branch 'master' of https://github.com/SOLA-SLTR-NIGERIA/clients
Merge branch 'master' of https://github.com/SOLA-SLTR-NIGERIA/clients
Merge branch 'master' of https://github.com/SOLA-SLTR-NIGERIA/clients
Merge branch 'master' of https://github.com/SOLA-SLTR-NIGERIA/clients
Fixed merge conflict on Paola's changes to the desktop jnlp settings