Fix
Merge branch 'master' of https://github.com/Steingate/imda
Fix
Merge branch 'master' of https://github.com/Steingate/imda

Conflicts:
	wp-content/uploads/2014/08/Koala-150x150.jpg
	wp-content/uploads/2014/08/formations-1024x426.jpg
Merge branch 'master' of https://github.com/Steingate/imda
Merge branch 'master' of https://github.com/Steingate/imda
Merge branch 'master' of https://github.com/Steingate/imda
Fix
Merge branch 'master' of https://github.com/Steingate/imda