Move Android code to root
Override .gitignore setting for *.properties
added override for Android projects
removing (unused) CISComms Factory references from DA Webapp
Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0
Add bootstrap.php.cache
Bug fix for the test engine
Redmine issue #1801 fixed
Merge branch 'Testing_Release_1.0' of https://github.com/societies/SOCIETIES-Platform into Testing_Release_1.0
Added more tests for android
New bug fix ti the Test engine
Merge branch 'Testing_Release_1.0' of https://RafikSM@github.com/societies/SOCIETIES-Platform.git into Testing_Release_1.0
poms - deps
R.layout.acknack_activity not recognised in container project
removed local reference to api
Added test project for Friends monitoring service
moved uam and user feedback under societies libraries
Fix for dependency issues
Merge branch 'Testing_Release_1.0' of https://aleckey@github.com/societies/SOCIETIES-Platform.git into Testing_Release_1.0
Cleaned up service wrappers, removed local wrappers