Fixed inline tasks
Merge branch 'master' of D:\users\mariia.verbenko\Documents\GitHub\issueTrackerAngualrjs with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	js/controllers/todoCtrl.js
	partials/createContent.html