started to rebuild the templates and css
the models
Merge branch 'angular' of https://github.com/loomio/loomio into angular

Conflicts:
	lineman/app/css/main.scss
	lineman/app/js/app.coffee
	lineman/app/js/filters/date_filter.coffee
	lineman/app/js/models/comment_model.coffee
	lineman/app/js/models/discussion_model.coffee
	lineman/app/js/models/event_model.coffee
	lineman/app/js/models/user_model.coffee
	lineman/app/pages/index.haml
	lineman/app/templates/discussion.haml
	lineman/bower.json
Merge branch 'angular' of https://github.com/loomio/loomio into angular

Conflicts:
	lineman/app/css/main.scss
	lineman/app/js/models/user_model.coffee
Add markdown directive for discussion description

Conflicts:
	lineman/app/css/main.scss
	lineman/app/js/models/discussion_model.coffee
	lineman/app/js/models/group_model.coffee
	lineman/app/templates/discussion.haml
Add faye to procfile