Merge github.com:Clause321/JIplatform into filter_form
use activityFilterForm

js still need modifying
required  = false
Merge branch 'master' into filter_form
add aaa to "filter_form"
correct returning datatype
add js diretory
finish rBool Ver. 1
merge rBool to getMore
correct post data and filter functions, ok to run
no change
change css
add pfuser with manytomany relation with groups
Merge remote-tracking branch 'origin/user_ctrl'
Merge remote-tracking branch 'origin/master' into group_ctrl

Conflicts:
	database