added config to set unique user id
Merge branch 'master' of https://github.com/nlathia/SensorDataManager

Conflicts:
	src/com/ubhave/datahandler/config/DataStorageConfig.java
	src/com/ubhave/datahandler/store/DataStorage.java