Customers
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/Customers/form/FormTemplate.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/views/Customers/ContentView.js
Merge branch 'master' of C:\wamp\www\crm_backbone_repo with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/views/Customers/ContentView.js
Merge branch 'master' of C:\wamp\www\crm_backbone_repo with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/views/Projects/ContentView.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/views/Customers/ContentView.js
Merge remote-tracking branch 'origin/master'
persons
10.09.2013.16:20