Added .project to .gitignore
Merge branch 'master' of ssh://git@github.com/spcsser/ep_adminpads.git

Conflicts:
	.gitignore