minor edit on kicklow tpl, and js
edited js and css
added bounty filter
fixed merge conflict, changed button to be span
bounty filtering change
Merge branch 'uf-461' of https://github.com/Webcraft-Myplanet/unicornfactory into uf-461
minor edit to js and css
worked on truncation and sorting
merged develop into branch and fixed conflicts
Merge pull request #307 from Webcraft-Myplanet/uf-461

Uf 461
fixed merge conflict