Add import function
Merge branch 'master' of github.com:gmnarak/Puun

Conflicts:
	Puun/Controllers/ReportController.cs
Merge branch 'master' of github.com:gmnarak/Puun

Conflicts:
	Puun/Controllers/ReportController.cs