added all code for java admin a[[lication and updated .gitignore
cleaned git cache for .gitignore problem
cleaned git cache
resolved conflicts
Fixed nullpointer exception and wrong transformation
Merge branch 'silvio'
merging latest code from silvio
Merge branch 'master' of https://github.com/mushfiq/rssi-system into
comReaderTommy

Conflicts:
	comReader/main/algorithm/ProbabilityBasedAlgorithm.java