updated the .gitignore again

careful with BuildConfig.java, should be ignored
modified enter_location.java
Merge branch 'master' of https://github.com/imtsai/Safety

Conflicts:
	res/layout/enter_location.xml
	src/com/example/safety/enter_location.java