fixes in grunt concat
merged changes