ticket:5 template missprint fixed
Merge branch 'ticket_4' into ticket_5
ticket:8 Fixed conflict with ticket_5
ticket:8 edit_link tag moved to the base.html file
ticket:8 String concatenation replaced with format string
Merge branch 'ticket_8'