Fix Bases
Merge branch 'master' into new_api
Fix include
Adding Servers Model
Merge branch 'new_api' of github.com:WFP-Dubai/Tracker into new_api

Conflicts:
	.gitignore
fix Funny
 Fix typos
Fix Position
Fix Logo admin
Fix Again
Fix Again
Fuxit
Fix Static
Fix Static
FIx Static
Fix Static
Clean Media Root & Static Root
Prepping GIS
Adding GeoDjango
Fix 1.5 version