Grunt Bower Copy
Merge branch 'develop' into bower-copy

Conflicts:
	assets/files-header.php
Grunt Bower tasks

Variables updates
Files names update