dump file of database updated #24/07/2014
Merge remote-tracking branch 'origin/master'