[FCS-11]
[FCS-10]Test changed. Improved UserData model.
Merge branch 'FCS-11' into FCS-10
Improved  'show task' view. Model for crawling type.
Improved MailingHelper.
[FCS-10]Increase quota, price_calculator, Service & ServiceUnitPrice model
Templates added
[FCS-10]
Migration.
Merge branch 'master' into FCS-10

Conflicts:
	fcs/fcs/manager/forms.py
	fcs/fcs/manager/models.py
After merge with master
Import bug fix
Templates added
Import fix 2
Templates added
Merge remote-tracking branch 'origin/master' into FCS-20

Conflicts:
	.travis.yml
	fcs/fcs/manager/tests.py
Update tests