Fixed applicationContextUpdate
Merge branch 'master' of https://github.com/Cremesis/SmartCitizenship.git
Too many changes
Merge branch 'master' of https://github.com/Cremesis/SmartCitizenship.git