Merge remote-tracking branch 'origin/master' into beta

Conflicts:
	configure.ac
	data/rc_models/Makefile.am
	data/rc_models/gb/rc.png
	data/rc_models/gb/remote.html
Merge branch 'master' into beta

Conflicts:
	configure.ac
	data/rc_models/Makefile.am
	data/rc_models/gb/rc.png
	data/rc_models/gb/remote.html
fix Makefile
Removed RcModel.py
Merge branch 'master' into beta

Conflicts:
	configure.ac
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta

Conflicts:
	data/Makefile.am
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'beta'