added faulted earth stuff... cleaned settings
cleaned up the faultedearth template
Merge branch 'isc-viewer-geonode2' into faultedearth-geonode2
moved faulted_earth under django project dir. rebuilt initial migration
rebuilt initial migration with geom support
renamed geonode to oqplatform
Merge branch 'geonode2-integration' of https://github.com/gem/oq-platform into faultedearth-geonode2
merge commit
Merge branch 'geonode2-integration' of https://github.com/gem/oq-platform into faultedearth-geonode2
re-enabled local_settings import
Merge pull request #56 from gem/faultedearth-geonode2

Porting of the faulted earth application to geonode2

[r=larsbutler,nastasi-oq]
Merge branch 'fe-devenv' into tmp

Conflicts:
	openquakeplatform/setup.py