Clearing history
fixed api controller thing for cycles
some js files added
updates to api thing for cycles
conflicts resolved
conflicts resolved