gitignore file
local changes
local changes
Merge branch 'master' of https://github.com/iron-hulk/JMPTrainers

Conflicts:
	build/classes/.gitignore
	build/classes/com/jmp/app/TEST.class
	build/classes/com/jmp/app/actions/MediaAction.class
	build/classes/com/jmp/app/services/appservices/impl/SystemServicesImpl$3.class
	src/com/jmp/app/actions/MediaAction.java
fixed: reports,analytics,deregister, profile, schedule,aboutus