Merge branch 'Plasma/5.4'

Authored by hein on Sep 21 2015, 7:04 PM.

Description

Merge branch 'Plasma/5.4'

Merged Changes

CommitAuthorDetailsCommitted
038b2e602897hein
Revert the preceding four commits -- wrong branch. 
Sep 19 2015
f29bb99d81c2hein
Merge the favorite-by-DND feature written at the Seoul hackathon. 
Sep 19 2015
56fce8da3718hein
Add a FavoritesModel.maxFavorites prop to limit the model in size. 
Sep 19 2015
e72c024d25c1hein
Add a FavoritesModel.enabled prop to toggle addFavorite/removeFavorite. 
Sep 19 2015

Empty Commit

This commit is empty and does not affect any paths.