hardcoded path in spring-security.xml changed to orignal

hardcoded path in spring-security.xml changed to orignal
em.close commented out as other classes are now using the close function to close the Database

em.close commented out as other classes are now using the close function
to close the Database
Fixed bug # 25 First request after server restart fail, 2nd time it starts returning device policies
Merge branch 'demo1' of https://github.com/MusesProject/MusesServer into demo1
Fix for bugs | Screen lock disable warning not showing the first time and #24 No popup at start of MUSES when Accessibility is disabled
 Fix for bug #7 Update strings according to AIT proposal
ChangeSecurityPropertyEvent model is modified, based on existing properties associated to security settings
-Improving decision function for demo 1