settyan add stage
Merge branch 'dev' of https://github.com/setu15/FishLight into dev

Conflicts:
	proj.ios_mac/FishLight.xcodeproj/project.pbxproj
Merge pull request #12 from setu15/dev

Dev