Fixed up topics, added better tests, converted erb to haml,fixed views for events and topics
merge master in conflict