Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/modules/examples/image_example/image_example.module