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
Background service,notification tested after ammend
build notification function
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
notification to comeup in notification drawer done
notification bug fixed,initial work of gcm implementation
conflict resolved after merge
User image implementaion done
pulled branch 'swati-copy' of git@github.com:zkhan93/SGI_app.git into mergingswati

Conflicts:
	project.properties