DSPRU test base url
Merge remote-tracking branch 'origin/master'

Conflicts:
	2014/07/18/project-1/index.html
	index.html