css renew
slice
Merge branch 'master' of 192.168.5.102:~/ccf into feature-seven

Conflicts:
	slice/slice_api.py
Merge branch 'master' of 192.168.5.102:ccf into feature-ui
fix
Merge branch 'master' of 192.168.5.102:ccf into feature-ui
slice
add unique index on Resource
add unique index on models
fix bugs
Merge branch 'bugfix-7.2.1' of 192.168.5.102:ccf into bugfix-7.2.1
fix project checkboxes
Merge branch 'bugfix-7.2.1' of 192.168.5.102:ccf into bugfix-7.2.1
fix project url in notification
adjust get invited user and post processing order
Merge branch 'master' of 192.168.5.102:ccf into feature-ui
fix applicant search
css renew
css renew
html renew