added some new ignore-rules
phpmyadmin fixed + gulp refactoring
phpmyadmin fixed + gulp refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/scripts/navigation/index.phtml
	application/views/scripts/navigation/login.phtml