Merge branch '7.x-1.x-issue-138' of github.com:signalpoint/DrupalGap into 7.x-1.x-issue-138
Merge branch '7.x-1.x-issue-138' of github.com:signalpoint/DrupalGap into 7.x-1.x-issue-138
Merge branch '7.x-1.x-issue-138' of github.com:signalpoint/DrupalGap into 7.x-1.x-issue-138
Fixed merge conflict.