Merged
Merge branch 'customization' of github.com:smartcampuslab/ShowcaseView into customization