Add spark support
Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure.ac
Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure.ac
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BoxBranding/RcModel.py
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BoxBranding/RcModel.py
	BoxBranding/remotes/Makefile.am
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BoxBranding/remotes/Makefile.am
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BoxBranding/RcModel.py
Fix rc id
Fix dir name
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'