faster load by delaying heavy ajax loads
Merge branch 'master' into fasterload

Conflicts:
	dipex/db.sqlite3