Merge branch 'develop'
Add directive that will handle modal
Add updated distribution files
Add styling for the modal view
Update distribution files
Add ng-click to open modal
Add ui-view directive to main template
Include new controller for modal
Add new directive for modal
Add new factory to comunicate between controllers
Include modalView as a subview
Update distribution files
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into addDetailView

Conflicts:
	client/dist/main.js
	client/dist/main.min.js
	client/dist/main.min.js.map
	client/js/controllers.js
	client/js/directives.js
	client/js/services.js
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into addDetailView
Merge branch 'addDetailView' into develop
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop

Conflicts:
	client/dist/main.min.js
	client/dist/main.min.js.map
Merge branch 'master' of https://github.com/Trrnts/Trrnts into develop