Merge fixes to particles, timer api, fixes in grunt file, and triggers