added ng touch
Merge pull request #81 from zindlerb/master

Added ng touch
fixing db merge issue
Merge pull request #82 from RTakes/master

fixing db merge issue
Merge pull request #83 from COPPER-BOBCAT/staging

DB merge fix