#28 Activate Deactivate method added
Merge branch 'master_issue_28' into development_feature_26

Conflicts:
	config/locales/en.yml