collection generator fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	collection/templates/collection.coffee
removed unnecessary npm  dependency
fixed capistrano releases number in deploy conf
added grunt-spritesmith
removed htaccess
grunt sprites smith readme file
added default haproxy configuration
Merge pull request #2 from maximkoretskiy/master

spritesmith + some fixes