Merge branch 'master' into develop
Updated coding style to match drupals
Added minimized jQuery cookie
Merge remote-tracking branch 'ding2tal/development' into develop
Merge remote-tracking branch 'origin/develop'