Develop: upgraded to 2014.07 and also a templates bugfix