f625681 Merge branch 'develop' into 'master' for release

Merged and Committed by tflink 9 years ago
    Merge branch 'develop' into 'master' for release
    
    Conflicts:
    	blockerbugs.spec
    	blockerbugs/__init__.py
    	blockerbugs/controllers/main.py
    	blockerbugs/util/bz_interface.py
    
        
file added
+5
file modified
+8 -2
file modified
+10 -9
file modified
+1 -1
file modified
+1 -1
blockerbugs/static/img/line-bottom.png blockerbugs/static/img/line.png
file renamed
file was renamed with no change to the file
file modified
+6 -4
file modified
+1 -2
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+5 -2