Merge branch 'master' into scottDev
add filter
Merge branch 'scottDev'
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork