Merge branch 'master' into outbound

* master:
  Makefile.groups: Updated package group for app_java.

Makefile.groups

@@ -139,6 +139,9 @@ mod_list_ims=cdp cdp_avp dialog_ng ims_auth ims_isc ims_icscf ims_qos \
 # - modules depending on osp toolkit library
 mod_list_osp=osp
 
+# - modules depending on java library
+mod_list_java=app_java
+
 # - modules depending on iptables library
 mod_list_iptrtpproxy=iptrtpproxy
 
@@ -161,7 +164,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \
 			   $(mod_list_mono) $(mod_list_ims) \
 			   $(mod_list_cassandra) $(mod_list_oracle) \
 			   $(mod_list_iptrtpproxy) $(mod_list_mi_xmlrpc) \
-			   $(mod_list_outbound) $(mod_list_osp) )
+			   $(mod_list_outbound) $(mod_list_osp) \
+			   $(mod_list_java) )
 
 
 
@@ -307,6 +311,8 @@ module_group_kims=$(mod_list_ims)
 # pkg outbound module
 module_group_koutbound=$(mod_list_outbound)
 
+# pkg java module
+module_group_kjava=$(mod_list_java)
 
 # list of static modules
 #