commit to pull
Merge branch 'master' of https://github.com/Grodien/APPE.f1301.01

Conflicts:
	fbsloader/lib/fbsguiclient/appe_fbsguiclient-0.0.0.jar
Added some stuff for stock
Merge branch 'master' of https://github.com/Grodien/APPE.f1301.01

Conflicts:
	fbsguiclient/lib/fbsservice/appe_fbsservice-0.0.0.0.shared.jar
	fbsloader/lib/fbsdata/appe_fbsdata-0.0.0.jar
	fbsloader/lib/fbsdata/appe_fbsdata-0.0.0.shared.jar
	fbsloader/lib/fbsguiclient/appe_fbsguiclient-0.0.0.jar
	fbsloader/lib/fbsservice/appe_fbsservice-0.0.0.0.shared.jar
	fbsloader/lib/fbsservice/appe_fbsservice-0.0.0.jar
	fbsservice/lib/fbsdata/appe_fbsdata-0.0.0.shared.jar