update
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb

Conflicts:
	src/java/main/org/strasa/web/browsestudy/view/model/DerivedData.java