Merge branch 'master' of https://github.com/mushfiq/rssi-system into
comReaderTommy

Conflicts:
	.gitignore
	AndroidApp/gen/com/example/chronolocalization/R.java
	AndroidApp/res/layout/activity_main.xml
	AndroidApp/res/values/strings.xml
	AndroidApp/src/com/example/chronolocalization/DataManager.java
	AndroidApp/src/com/example/chronolocalization/DrawableImage.java
	AndroidApp/src/com/example/chronolocalization/Line.java
	AndroidApp/src/com/example/chronolocalization/MainActivity.java