Merge branch 'master' into linda

Conflicts:
	app/index.html
	app/partials/csvtrans.html
	app/partials/rdbtrans.html
Merge branch 'linda' of https://github.com/LinDA-tools/r2r-designer into linda

Conflicts:
	app/partials/csvtrans.html
	app/partials/rdbtrans.html