Add Bundle
Merge branch 'dev-max' into dev

Conflicts:
	.DS_Store