Changed the way links are generated. Now generated via link tag where possible
Signed-off-by: Andrey Shevchenko <andrey.shevchenko@sysgears.com>
Merge remote-tracking branch 'origin/master'