Merge branch 'master' into develop
Removed un-need types in the make file
Updated pathauto and token modules
Exported with features 2 and language as english
Merge remote-tracking branch 'ding2tal/development' into ding2tal
Merge branch 'ding2tal' into develop
Merge branch 'develop'