#1600 - Akash - modifying seed data
1644 - Akash - fixing issues with user history. making record creation an explicit entry in history
Merge pull request #407 from rdsubhas/master

Revert report generation back to Monday
1644 - Akash - removing history entries for other users when viewing user history log
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	db/seeds.rb
Merge pull request #410 from akash/master

#1644 - fixing user action histroy defects. #1600 - modified seed data
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
	spec/controllers/children_controller_spec.rb