11111
Merge branch 'master' of https://github.com/Foboy/GoGoTown
1111
123
111111
111
1111
11
Merge branch 'master' of https://github.com/Foboy/GoGoTown

Conflicts:
	trunk/crm/.settings/org.eclipse.core.resources.prefs
	trunk/crm/admin/index.html