add modal window Addition and Subtraction
Merge branch 'develop' of github.com:softwareplanet/automizely into develop

Conflicts:
	app/client/views/smartlinks.html
Merge branch 'develop'