add collection view controller
Merge branch 'release/20140111-1507' into develop