commit by cryptic
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/InteractiveTOS/BusinessBundle/Dao/TosDao.php
	src/InteractiveTOS/BusinessBundle/Resources/config/services.xml
Merge remote-tracking branch 'origin/master'
commit by cryptic
commit by cryptic
Merge remote-tracking branch 'origin/master'