aspect and modifier model created
Merge branch 'master' of github.com:shaokanp/amazon-review-cloud

Conflicts:
	.idea/workspace.xml