Updated dist, some minor grunt changes
Merge origin/develop into develop