Moved the current addition implemenation to concatenate(), implemented a simple addition as actual addition
Merge branch 'dev'

Conflicts:
	lightcurve/tests/test_object.py