added image loader basic loader
Merge branch 'master' into richard_dev

Conflicts:
	TedXEventApp/build.gradle