Merge branch 'ticket/167' into develop

James Moger

2014-09-05 b8a44784ba8b0aaf9a3fbe6321956c0ee0e0451c

 src/main/java/com/gitblit/servlet/ProxyFilter.java

@@ -20,8 +20,8 @@
import java.util.Iterator;
import java.util.List;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;