Merge remote-tracking branch 'upstream/master'
touched up migration generator
added http_referer and browser language to request log
more consistent last_action view
updated airbrake gem
new bootstrap
added "follower notification email+*from", fixed "follower notification email+*html_message"
prettified migration mode handling
solved the "same edit on same card" issue
add search icon to novbox
removed point release in gemspec
Merge remote-tracking branch 'wagn/wikirate' into wikirate
html view for ALF cards
Merge branch 'master' into last_action
eof
fixed last_act bug
Merge remote-tracking branch 'origin/wikirate' into wikirate
fixed request logger bug
Merge branch 'master' into wikirate
Merge remote-tracking branch 'origin/wikirate' into wikirate
cleaned up extra spaces