first commit
ss
model completed
model complete
model bug fixed
interceptors, sign service and sign action completed
sign module completed
add location is handling
add location completed
add location action completed
search location
search location
the fucking commit message
location homepage 80% ok
location homepage 80% ok
the fucking commit message
the fucking commit message
check location, add media, backend ok
commit
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	.classpath
	.project
	.settings/.jsdtscope
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/META-INF/MANIFEST.MF