Merge branch 'index'
added shortcut images
Merge branch 'master' into index