first branch commit swati
commit with edit readme
pulled from zee-copy
no change-swati
Merge branch 'zee-copy' of https://github.com/zkhan93/SGI_app into swati-copy
testing db
Merge branch 'zee-copy' of https://github.com/zkhan93/SGI_app into swati-copy

Conflicts:
	src/in/siet/secure/sgi/MainActivity.java
Merge branch 'zee-copy' of https://github.com/zkhan93/SGI_app into swati-copy
no change
pulled branch 'zee-copy' of https://github.com/zkhan93/SGI_app into swati-copy

Conflicts:
	src/in/siet/secure/sgi/LoginActivity.java
	src/in/siet/secure/sgi/MainActivity.java
spelling correction
Merge branch 'zee-copy' of https://github.com/zkhan93/SGI_app into swati-copy
added setting to change server ;) cant style it right now..:(

back button exit warning
Background service,notification tested after ammend
fixed filter(Generalized) getting from serverdb
working show users new db struncture
build notification function
working filter adding users to app db working
some layout changes in login fragment
pulled branch 'zee-copy' of https://github.com/zkhan93/SGI_app into swati-copy

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/in/siet/secure/sgi/LoginActivity.java
	src/in/siet/secure/sgi/MainActivity.java